made shit more robust