Modify for better express