Simplified changes..