Should have really added this earlier