fixed syntax and replace calls