adding jin's changes