merged homieg branch changes