#Fixes Final

sample with fixes