Feature/rx alerts