Cleaned up 02-start