Bug Fixes and Backup Class