removed intake/added skeleton