Changed sig and remved extra code