Did more basic stuff