Final commit Its working :D