moved stuff into block