some more changes
did some design changes ..