done a little maor :p