ADDED: Added work from test project to bring inline.