improved and moved BEACON format to front