refactoring and added new textures