trying to move into assets, to easier merge