Added functionality and visual additions