merged with updated code :)