added more functionallity