TJ's additions and modifications