reworked loading, works a bit better now