Class Layer edited. Further changes to be done.