Commit 8

Fixed Problem around Layer-2