simplifying loading procedure to make life easier (and because it had some bug)