finetune
 #6 @1h update