finally sorted out shiznit