Fixing basic functionality