Added kernel, changed Layer a bit