updated! Feedback is allways welcomed