reverted to simpler component