Mainly at Rest: optimization and fix update

optimization and fix