Refactored to comply with the rest of the code.