refactored slot based modifications
Merge pull request #151 from sajinidesilva/refactor2

refactored slot based modifications