updated... again

merged faadhils stuff