removed all casts
Stuck
merge conflict resolved