V1.9 with bugs