Tried to solve #146
Solved #36
Solved #66