still trying to fix commit errors