Removed debugging, improved post registartion process