Version 2, without all of those lines