added manager functions

merged stuff