some more functionality added