Updated version with new design