Removed original stuff
Added current implementation.