newest changes, just adding james'stuff