Merged with my code