everything back working, but nicer