Found the missing bits for the last commit