merged w leon's layout