Second Commit with more changes and requirements

I think