Updated Files

Added Missing logic