initial commit
remove hardcoded values
bug fixing
bug fixing
bug fixing