pulled oskar branch changes