making some movement on #471