merged jalle's work