Bug fixes
methods that will be done