Adding changes from dev