Temporary used for LMS REVAMP