Yes, I missed few places, as this code has been written before the components. :)