Fix methods and updating position