Changes for manual making