Final touches to take care of ordering