Modified layer functionality. System is no longer client-biased.