Added Following Code and other