Resolved conflicts and implemented the first release
Added a parameter count