Refactoring and added some variables
new release