Made the loading more fluent