removed hash, changed layer structure