Fixing the creation view to make it faster