Finish the implementation

smoke testing on s4