Edited Solution