Adding changes to version 2