Feature/accept makeup