Custom messages fixed -needs testing-