Working on fixing some artifacts