Part y+3
Fixed some bugs