EDIT: chaanged one boolean