Refactor, assets added