Added some new right code for #4
#4