Updated to work without format function