P54 Refactoring (Add guard)
P54 Refactor