Switch Layer and fix to the Object Oriented aproach