more updates to get this working