Edit and Complete

Please talk to me before changing these functons