small changes in metode. FINAL COMMIT