Made the implementation consistent