added some functionality to other branch