added prefabs, merged code