working fine stil need cosmetic changes