merged
fixed key issues