done enough
finilizing branch