Issues #203 #204 #205 #206 Implemented