Hardware train tucking

Hardware train tucking