updated to easier version