updated to use 3.2.3 supportlayer