Simplified the software