Simplified the code!