Add Counter & fixed Trash