#7 Added overrides to hide overflow