fixed create and remove