moved assets. optimised code a little