Added functionality and graphics