change skeleton for better automation and fix mistake