Adding johnny's changes