Added juha-stuff