added more features flo wanted
fix merge