Updated dependancies and modified source to suit