making things way more robust