Completed bsic makeuping