changed way of content loading