Bug Fixes with load functionality