dev

added more functionality