Some changes (edit is bugged atm)