fixing up substrates layer