Updated, should be ready for testing