Changes based on @apeiron's feedback