-Added solution for 4.2
-Fix dependencies