Implementation of both methods finished