Pin movement major fix