New simplified version