Fixed angle thing and added random arrangement