Fixed and working registration!