added more functionality, working really fine