Updated with license and layer fix/improvement.