Upped version. Merged in @adammagaluk's werk