Make it more like a real app
fix all self calls