Added fill toggle