merged jalle's and mine