End of the day, still buggy