updated with tips etc