LPS-39556-prototype (See the action logic please) NOT TO MERGE, JUST FEEDBACK