Adding Jay last modifications