trying to merge laptop and andromeda versions