OverCap functionality added