1. Fixed naming
2. Working on sample