Started updating implementation