fucking added EVERYTHING