reworked asset loading