fix 0.006Final

Fixed code/improvement