better implementation of embedded manager