fixed destroy time
layer adjust in its own function
formatting
Merge commit '7625edcfd0f0ae7577b7696deaa0a526a0dd0044' into develop