Replaced some parts with better real world representations