Added skip when building level is done + refactoring