Works better, looks nicer