removed swap and fixed materials