First Day: Bugs Fix

Bugs Fix