commit before merging point and drawable point into one class