#297 #298 applying comments