Everything is better, adding back fields and fixed gateway