updates from 22.12.2014 oh ye!