Updated with Justins input